From: Dave Airlie Date: Tue, 15 Jul 2014 03:25:58 +0000 (+1000) Subject: Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6... X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6301^2~2 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=85d9e14cfde5393980c3dc29b9f3ef0d30424dfc;p=linux-4.9.git Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes deadlock fix. * 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: drm/nouveau/therm: fix a potential deadlock in the therm monitoring code --- 85d9e14cfde5393980c3dc29b9f3ef0d30424dfc